Merge changes Ib8ccc370,Id68c1840

* changes:
  Add missing symbols to android-18 libc
  Copy libc symbols from android-17 to 18