am 6ec8d1fa: am afbef39f: Merge "fix broken apache-harmony tests."

* commit '6ec8d1fae7f87258b254a12fa39bc0497a8f2edb':
  fix broken apache-harmony tests.