Merge "Remove the disabled test for zlib determinism." am: e7a73c4239

Change-Id: Iaa8923c64dcd2c3ec00cae364e68563dc129971f