Merge changes I388100b1,Iefff94c4
am: b01728f119

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