Merge "Do not specify FORCE_CPU_VARIANT_* for host build"