Merge "Break some dependencies on libcore internals"