Merge "Track removal of android.system.Os.{sendfile,waitpid}." am: 833aa452a8 am: 0712266bd4
am: 6cade7fdd5  -s ours

Change-Id: Id4e5329ee78a816fd3212882ceb927c92da339fe