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

Change-Id: I6d593a0cbf81df43e8dbdc5d728a42c5fd34e616