am d898312e: am af6d2d87: am aeaa0f5c: Merge "Turn shared library multilib warnings into errors"

* commit 'd898312e3aa57af4718d34fcd8b1cfd318460dcb':
  Turn shared library multilib warnings into errors