Merge changes Ic24593e1,I3b5f82dd

* changes:
  Add new libm symbols to android-23
  Copy libm symbols from android-21