Merge "Merge "[framework] Compile secondary dex files in isolation" am: e9e3bfe353" into stage-aosp-master
am: 2dcee11c41  -s ours

Change-Id: Ia5d6d12e917ac4a4b6cce926b61d300c3feb2541