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

Change-Id: Iab20782ec9298040a474f08ea34ac3e5f4d1a677