Merge "Merge "Break some dependencies on libcore internals" am: f672c2bcb8" into stage-aosp-master am: 557a4a7a16
am: 0aacb8067a

Change-Id: I05edf90bd34841ba1b441a73813ea1debe21f6c0