Merge changes I43bd1f93,I96c891e9,Ied502e82 am: 49efd7364f
am: bc5fecb8fd

* commit 'bc5fecb8fd990216d9a3cdbab9db536880a0f2c2':
  android-21: restore utimensat for mips libc
  android-21: Restore __ns_* symbols for lp32 libc
  android-19: Cleanup libc symbols