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

Change-Id: Ie6d5edeb8157379914441f769f887622209aeb02