am bcfa67e5: am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH"

* commit 'bcfa67e56dd7862d085954d2c4b349f8199c3d28':
  Switch to SDK_HOST_ARCH