fix broken apache-harmony tests.

(cherry-picked from e9964f9012935ddf3189378f113defa4c41f2f38)

Change-Id: I2565bc5cf9b5f4b6ae99187983cccad771f8b02d
7 files changed