Merge changes I20b50641,I309db462

* changes:
  Add new symbols to android-23 libc.so
  Copy libc symbols from android-21 to android-23