Merge "Remove libcore usage of IoUtils.close()"