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

Change-Id: I722c0eda809ff589547845e3e6abb39e34f62b80