Merge "Drop unused libcore.io imports." am: 58d5c1e938
am: 66234e3975

Change-Id: I9d48b9ae7ed1e05734110ca0dad8db8a6d743add