Merge "Don't use DEX2OAT_BOOTCLASSPATH for apps."