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

Change-Id: Ie5b48e17c3b4f6fb4ec7c28e9d3188e233ec1794