Merge "Add ART_DEXPREOPT_BOOT_JAR_DIR." am: 4592f5225a
am: 7c6355aa4b

Change-Id: Icd394e5b9f7a2b21f8a078a0f64134656f7cbf85