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

Change-Id: I413a2912857750252af531802514cdc89003f159