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

Change-Id: Ic699729f166b959e3258aec5d47dc6eb84cd0d5a