Merge "Update run-tests script/dependencies to use -testdex jars."