Merge changes Iaa2aba28,I3ed36a15

* changes:
  android-18: Cleanup libm symbols
  android-18: Cleanup libc symbols for x86/mips