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

Change-Id: Ida3e1a1ccbb22e7f46354ad67536fb3e9e35a984