* commit 'e7c249230b31d6e5d6971c724091d9eecd4e8c43': Fix a few more stray libcore.io references.
d937f275
12928a07
2336c4ec