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