Merge "Revert "[framework] Compile secondary dex files in isolation""
am: 2c0278d35f

Change-Id: I038f2b273aa5767e22995782ff939fe89f91e89d