Merge "Track removal of android.system.Os.{sendfile,waitpid}."