Switch test code away from libcore internals
am: 06ceead104

Change-Id: Idca3b7fc0d9e0fb2dcecc395e1a7ad9b464fa5ee