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

Change-Id: I830ed6860def3f09887c42c56e8f71f0cd20fada