Merge "Remove unwanted symbols from libz"