Merge "fix broken apache-harmony tests."