Merge remote-tracking branch \'goog/master\' into nyc-dev
am: c0b2763

* commit 'c0b2763154e4219e65bb3f827e783512c962364d':
  Allow x86+arm multilib build.

Change-Id: I535e71691cec5500dd084e49a7ee7e1828fb4c0d