Merge "Switch to SDK_HOST_ARCH"