Merge "Move JUnit classes from frameworks/base/test-runner to here"