Merge "Revert "libz provides stubs to Mainline modules."" am: 2016b9831b am: 741f27651d

Change-Id: I52daa16ee5dddfda5e6cdad1eb8bfbfb809fc1f2