Merge "Deprecate android.system.Os.setuid and the likes"