Merge "Remove unnecessary libcore includes"
am: 0e8d654f7d

Change-Id: I4302b2efb0ccb142d227cfebde217cf7a484ab6d