Merge "Update run-test dependencies on device."
am: 8f26b1039a

Change-Id: Ic8a87bf2993e4c1a058341b941369dd53f979445