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

Change-Id: I92174d3f6dfdc5cc9178b05e12e4a54d49dc727f