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

* commit '837e4189088103255a2e220b06d1a62e5842e5af':
  Allow x86+arm multilib build.