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

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

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build