Merge "Statically include android.test.runner classes in legacy-android-test"