Merge "Track removal of android.system.Os.{sendfile,waitpid}."
am: 833aa452a8

Change-Id: Ieed0816cddba7d05bbebceae9ca6f5bc1f55bd08