Merge "Stop building unused dex.txt files" into rvc-dev