Use JUnit classes for running JUnit3 tests am: dfd9233635 am: dc4043d15e
am: fa08deb637

Change-Id: Ic8403166750991e34b211527bb699f398a416972