Merge "Revert "Allow libz to have stub even though it's not an LLNDK li...""...
Merge "Revert "Allow libz to have stub even though it's not an LLNDK li..."" am: 03c694d0 am: 0149ab8a am: b93c0cb8 am: e54ed565 am: b3a78a23
Change-Id: I705061a584c91f040dc529dd708467ebbe25844f