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

Change-Id: I9b972b58ffb5393a3189ccb25ea8420defddbf98