Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting"