Remove use of -testdex jars am: df56643f3b am: 076c092efd
am: cd2c9f20d3

Change-Id: I44f5fa7dd9c167b78cab8bbeca920daa441d53ac