Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os"