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

Change-Id: Ie28a471c402b9e6405a44ef8c9b5855158d12b80