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

Change-Id: I5d7eb16906c11ad155ce5a1d05ea5127ce929c6d