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

Change-Id: I6946a361834bc1f05a2a80fac22d866ada181c5d