[automerger skipped] Remove unnecessary libcore includes am: 23a97d8d46
am: 0ef27dac21  -s ours

Change-Id: I594bfa59f9ccafa19fa466ffe7a77f8d1407c742