Switch test code away from libcore internals am: 06ceead104
am: 35166f01a9

Change-Id: I3d47b3cdf790dfe3cb0c9be5a272ed753a8a97a8