Merge "Remove deprecated android.system.Os.{ioctlInt,sendfile,waitpid}."