Merge changes I388100b1,Iefff94c4 am: b01728f119
am: fff86a9fe2

* commit 'fff86a9fe2069257ffc992af891ee48b2c0089ae':
  Remove symbols which are not in platform libm.so
  Remove symbols that are not in platform libc.so