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

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

Change-Id: I331ec0d222ef7505e84d6ddf22f9df266fc6a1f3