Merge "Remove libcore.io.Os from intra-core API"