Merge "Switch to using android.system.Os for more calls"