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

Change-Id: Ie3cb0e790ab472128e2fd1228061119562880b4a