Merge "Include <assert.h> for static_assert in C11." am: 67106b6dcc am: 143356c71e
am: 0ae1a57e2f

Change-Id: I06c3ce22d5c5f8daf65ce8373b7341fb67885b10