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

Change-Id: I8edbd441741c23efdbfa300a8d04a9825ee77224