Merge "Improve consistency of prebuilt android.test.runner with source"
am: b189fadb38

Change-Id: I8d17059b019950da1c0155f6f570ce7ef9c827f8