Merge "Use *-testdex in libcore and jdwp testing." am: fa965a74a7
am: 0208e0a689

Change-Id: I27bb645aa783c57302b735fa78accd0ffeabe87a