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

Change-Id: I9a2a3ade50ec7a29885d585166c9bce1ea9651dd