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

* commit 'c8ed8c25bc796cd82fb1df0ea100e320a542eeb3':
  Switch to SDK_HOST_ARCH