Merge changes I20b50641,I309db462 am: a0dbf86e52
am: 7bc945ceff

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