Merge "Revert^2 "libz provides stubs to Mainline modules."" am: c6b30343c2 am: f3a62bc02a am: 4efd9ff414

Change-Id: I62dad83c5575f1e927e8d91656d34fbae5b4dd9a