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

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