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

Change-Id: I521d14015c2367fad26c5167b80e2ff53a3e8b8a