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

Change-Id: I82ee47da2ef0dca5ec4fbfec500db29854026558