Merge "Merge "Statically include android.test.runner classes in legacy-android-test" am: 9588b607 am: e73cd1f6" into nyc-mr2-dev-plus-aosp