Merge changes Iaa2aba28,I3ed36a15
am: 6a8ad129ef

* commit '6a8ad129ef54a4748b00c458443ed62dcac433f8':
  android-18: Cleanup libm symbols
  android-18: Cleanup libc symbols for x86/mips