Merge changes Ib8ccc370,Id68c1840
am: f559375df6

* commit 'f559375df6d1481a51265a945cee33be2402144b':
  Add missing symbols to android-18 libc
  Copy libc symbols from android-17 to 18

Change-Id: Id2968083f7bd7e0d1d7ef5d303858a7961e99f6c