Merge "Remove zlib_fingerprint." am: 45db7492d6
am: 9964f0190c

Change-Id: I344b6a0e4e5d8f447d104941f8cb76c50066b3ea