am 14d43108: Merge "Add Junit4 to the classpath for CollectAllTests"

* commit '14d4310803ee2b9811a7adb381a2ca54b96aefe2':
  Add Junit4 to the classpath for CollectAllTests