Merge changes I4a37ec68,I91085cd2 am: d0a4254dbe
am: 4083875fc2

* commit '4083875fc2c0a400cf452d80c20e12d3d8462a57':
  android-22: add missing ns_* sybmols for lp64
  Copy libc symbols from android-21

Change-Id: Ie824660ec0b8f96602a3aaac6798cea97686bd00