Merge changes I0bfcda01,I7048b8b2
am: a02c6b5c8f

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