Merge changes I0bfcda01,I7048b8b2

* changes:
  Cleanup libc symbols for android-17
  Remove LIBC_PRIVATE symbols from android-17 libc