Merge "Statically include android.test.runner classes in legacy-android-test"
am: 9588b607f0

Change-Id: I17d3c541190c3301b27ee09806681615d97a6240