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

Change-Id: Ia9520e9e65588707861701c59cf91fce6bc7a9c8