Merge "Test android.system.Os instead of libcore.io.Libcore.os"