Merge "Remove libcore.io.Os from intra-core API" am: 36aa0fdc9f
am: c181c32f34

Change-Id: I8b6c38414ee2275d331758e3cd70354737935c76