Manual merge of c90f05ad

"Clean up makefiles for TTS data files."

Change-Id: I45a8f9887159de4d051455fc3feb202c26b9b8ce