[automerger skipped] Merge "Stop building unused dex.txt files" into rvc-dev am: 56f55b98 -s ours
am skip reason: Change-Id Ic58875a315c9d1dc09b029d3de405a5f5648c46e with SHA-1 d8fdf73d is in history
Change-Id: I2e59fd36652c0c15500b781a7c6a8c770d519339