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

Change-Id: I3d8d2ff82afdfd7cd313b6669f2379ec39947f3f