Merge "Track removal of Os.waitpid(..., Int32Ref, ...) from API." am: 9f82b6bab5
am: c4905215cb

Change-Id: I064799b5db75c15bff441e9e35a32f5e89f56c35