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
Change-Id: I3540997a0a36a42084ef7b022aaaf94bd1081aa1