Merge changes I4a37ec68,I91085cd2

* changes:
  android-22: add missing ns_* sybmols for lp64
  Copy libc symbols from android-21