Merge "[framework] Compile secondary dex files in isolation" am: e9e3bfe353 am: c14fcf466a  -s ours
am: 9879b68de8  -s ours

Change-Id: Ibcab3e7b21962ff7b1a04e927e5b10bcd167e29a