Merge "Break some dependencies on libcore internals" am: f672c2bcb8 am: 8d59399398 am: e3b9960277
am: f221bd013f

Change-Id: I4d64c0a3c3f3c10482f395b32c5f348383114b4f