Merge "Allow libz to have stub even though it's not an LLNDK library" am:...
Merge "Allow libz to have stub even though it's not an LLNDK library" am: b4ce1e97 am: 86a5ba67 am: 8968836a am: 20fd969a
Change-Id: Ie04363344a8c925586fd2530f85e3c8fd157d7b8