Merge changes I31ddaf44,I07c99308

* changes:
  Add missing symbols to android-17 libc
  Copy libc.so symbols from android-16 to 17