Merge "Use alignas for alignment."
am: bb1e7977fb

* commit 'bb1e7977fbd4b0f156d40f78695e2ff53db200a1':
  Use alignas for alignment.

Change-Id: I49592b6c75825b9e094fa6755bb0ce281a30135c