Merge "Update run-tests script/dependencies to use -testdex jars."
am: 39edd8b494

Change-Id: Ia4599de41fe135d7306a24afa08fc9f7a033c10b