am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH"

* commit '1e1b10acd152ae67670587ef1682ba6a3ed8a66c':
  Switch to SDK_HOST_ARCH