Merge "Libcore: Ensure JUnit3 test method is run" am: 99b76c67a0
am: 0ae33ea664

Change-Id: I237b77154a2e286bff62fc4b6f15d0357293cb35