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

Change-Id: I412d360beddec3271b79bc5db813ffba486ae738