Merge "Revert "Revert "Allow libz to have stub even though it's not an ...""...
Merge "Revert "Revert "Allow libz to have stub even though it's not an ..."" am: 550ff8cb am: df88e6fd am: 98a8d641 am: 460d751b
Change-Id: I9f3a486939ad970aed54b02259404f5810c3d41c