Merge "Stop building unused dex.txt files" am: 8a8b52a6be

Change-Id: I7fd42f4e8d388e5cc822b16fc012078aa5c9d7a7