Merge "Deprecate Os methods that depend on Mutable*, replace with Int*Ref"