Merge "Stop building unused dex.txt files"