Merge changes I31ddaf44,I07c99308 am: 42f3f55818
am: 1afd49a3d0

* commit '1afd49a3d0ce1cdba507e2c0f96c34840cf38572':
  Add missing symbols to android-17 libc
  Copy libc.so symbols from android-16 to 17

Change-Id: I8f6ad87bf4ab765c892605490327ba56d6d3c708