Merge \\\\"Remove libcore include dependency\\\\" am: bb9517f0bb am: 6fef513454 am: 38998cbf6d
am: f477852328

Change-Id: Idb602ef5a279fbdb50f6cd5decb34f84d0afa1e5