Merge "Allow x86+arm multilib build."
am: 91ac272

* commit '91ac272c11775630735dde3190de9f2da8f3f3eb':
  Allow x86+arm multilib build.