Merge "libz provides stubs to Mainline modules." am: ac037f23da am: 9bd6f9d313 am: 78ca1e9618

Change-Id: I3562e850f5bda436ca15d368a619ba793bb37b04