Merge changes Ic24593e1,I3b5f82dd
am: 42dd1d3072

* commit '42dd1d3072ee4721b28816bdc967a9ada572fcd1':
  Add new libm symbols to android-23
  Copy libm symbols from android-21