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

Change-Id: I791cbf004c8eff278a75bcaa86f9d86e4d0526ad