am 84fbb900: am b0ea93b7: Merge "Do not specify FORCE_CPU_VARIANT_* for host build"

* commit '84fbb900e2b556aa42bc08e65f306da928d69469':
  Do not specify FORCE_CPU_VARIANT_* for host build