Merge "Add a DEX2OAT_BOOTCLASSPATH variable." am: 1706eb08fe
am: e25fa6da1b

Change-Id: Iac2edb56374e571a3a741edfa9279a82a63f50f8