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

* commit '4cdb6eff413aeb29dc90ce3de3253d35b603fbe2':
  Remove unwanted symbols from libz