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

Change-Id: I99ceef172af0eb3b302178928a642baace891a2f