Merge "Remove tests from external/apache-harmony"
am: e290f33f19

Change-Id: I70f46633519fe70cc084ede67dfc8e37b6d22ab4