Merge "libz provides stubs to Mainline modules." am: ac037f23da

Change-Id: I86c92c3f68ec5eeaef897822a4b9fa1ff682a1ff