Merge "Remove unnecessary libcore includes"