Merge "Fix HOST_TOOLCHAIN_PREFIX"