Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting" am: 6c45f4493e am: 3c131856ee
am: 92a73a0f6c

* commit '92a73a0f6c0c768d4bc612106e0c6ddcb7fb2846':
  Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting