am 578914b7: (-s ours) am 84fbb900: am b0ea93b7: Merge "Do not specify FORCE_CPU_VARIANT_* for host build"

* commit '578914b74b93cfe096128d76f1ccf6bf3b9553d7':