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

Change-Id: I234d938606b07a5116c39dfcc378d55bcd521c2d