Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting"
am: 6c45f4493e

* commit '6c45f4493e125f4632ee0d0ed95d0198018cbb80':
  Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting