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

Change-Id: I90cb0253e510be809953a484774b23f103a13b73