Merge changes I526f653e,Iefacd446

* changes:
  vndk-def: Add libz.so back to LL-NDK
  vndk-def: Add libandroid_net to LL-NDK