Merge "Break some dependencies on libcore internals"
am: f672c2bcb8

Change-Id: Idac0ae9e4271aa09f8c7481de0509b69f3862141