Merge "Remove tests from external/apache-harmony"