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

Change-Id: I6e336cecc9d70a78e52e982c832535f57e91014e