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

Change-Id: Ib9328977112fddc634afb69bf67e915059c30566