Merge changes I0bfcda01,I7048b8b2 am: a02c6b5c8f
am: e1c9848e15

* commit 'e1c9848e15892c71c17c3f965db869ff2f92b6f9':
  Cleanup libc symbols for android-17
  Remove LIBC_PRIVATE symbols from android-17 libc