am 0ab5cc6b: am 99332f11: Allow for opt-in of proguard shrinking of tests with new flag

* commit '0ab5cc6b8e04e0a07778f3c620a9edac3a40bc4e':
  Allow for opt-in of proguard shrinking of tests with new flag