am cac57f7e: am 08746f5b: Merge "Fix NoClassDefFound in tests with proguard-test.flags" into ub-gmail-ur14-dev

* commit 'cac57f7e1621684b3bbbd7673ca87011ce88fe94':
  Fix NoClassDefFound in tests with proguard-test.flags