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

* commit 'afbef39f4c03eb6c879ad1cf75612000c28ef8b9':
  fix broken apache-harmony tests.