Merge "Merge "Amend testCompress for newer JVM" into oreo-cts-dev am: 265656c5e1" into oreo-mr1-cts-dev am: d8928334c6 am: 5a4f5cde01 am: a6bcc91403 am: 38ba949145
am: 467db5b7e8

Change-Id: Ie3b1a166820cea35422b633c4fc7b24e426a1862