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

Change-Id: Ic0ec879a9bd7e5df3359597c093a94a776d129e7