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 am: ac972f15
Change-Id: Ib8167911c8d7daec9d54a198c20609e6ed2536e7