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

Change-Id: I5308a08a686c3d9b5fc2e0f8d6be228881a166d0