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 am: e8990750
Change-Id: Id75555a619bf342ba7be96ae7c0357c1aeabd528