Remove use of -testdex jars
am: df56643f3b

Change-Id: I0e74fe3ce584fa339b93b9f6988cfbbecd431fc4