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

Change-Id: Ib5d2cc1ae84c270ce81bc44f6b413f3288a7b68a