Merge changes Iaa2aba28,I3ed36a15 am: 6a8ad129ef
am: 291f794bdd

* commit '291f794bdd91bf50ced3a2e05c4fbf84bd41ae8d':
  android-18: Cleanup libm symbols
  android-18: Cleanup libc symbols for x86/mips