Merge "Merge "[framework] Compile secondary dex files in isolation" am: e9e3bfe353" into stage-aosp-master