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

Change-Id: I3c14daee131e69850bbae0b0aefa3d755c7eb1a2