Merge changes I43bd1f93,I96c891e9,Ied502e82
am: 49efd7364f

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