Merge "Use DEXPREOPT_BOOTCLASSPATH_DEX_FILES to build boot_profile_jars.zip"
am: 246e728614

Change-Id: I3ac06372372615757f1ead6acebaa63c81b391b4