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

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

Change-Id: Ic47cf4f7aa6658aa21745e7326b91ed509daad58