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