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

Change-Id: I23a0cd0a8c44b83475055f6aa7723d3773bfe709