Remove unnecessary libcore includes
am: 23a97d8d46

Change-Id: Ic13bcf0477fecd609db8224dc8f9298fa94fa7f9