Merge "[framework] Compile secondary dex files in isolation" into oc-mr1-dev
am: 446e8babd6

Change-Id: I341efd5d36021b29a84fed72a715c6babb324e68