And fix one thing that this found: apparently <stdlib.h> should also make the various *WAIT* macros available. Bug: N/A Test: builds Change-Id: Id879bf3c1bddd1170261a809e7280150a74d6b3d