[automerger skipped] Merge "Remove unnecessary libcore includes" am: 0e8d654f7d am: e85263ca59
am: 7021cabb8b  -s ours

Change-Id: I1b325fbb869e9ad8fe2e6ac00aba324d1abaa476