Merge "Break some dependencies on libcore internals" am: f672c2bcb8
am: 8d59399398

Change-Id: I06ccaff955d476cd6490729703b0000cbd4aa496