Merge changes Ic24593e1,I3b5f82dd am: 42dd1d3072
am: 312d158abb

* commit '312d158abb1ebd5b44e4702df5f52c08ff8857cf':
  Add new libm symbols to android-23
  Copy libm symbols from android-21