Merge "Revert "libz provides stubs to Mainline modules.""