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

Change-Id: Iebc061d25e9876f5dbb3af6e2b037e78c1401906