Merge "Move JUnit classes from frameworks/base/test-runner to here" am: f7fb4fd231 am: c595c3cdb9 am: 861bcb8cb8
am: 9858088dc3

Change-Id: I3daca3469607af5832e43167dda3d2841cb18c7a