Merge changes I20b50641,I309db462
am: a0dbf86e52

* commit 'a0dbf86e52076548f9f2afdbe9c76532e78a160e':
  Add new symbols to android-23 libc.so
  Copy libc symbols from android-21 to android-23