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

Change-Id: I77fcf3c48fed409a05028dd6df5f28f0d0ce56fb