Merge "Remove unwanted symbols from libz" am: 4cdb6eff41
am: b47d5ee447

* commit 'b47d5ee44731310763ad38041e21023c3f1de550':
  Remove unwanted symbols from libz