Merge "Use alignas for alignment." am: bb1e7977fb am: 689b998ab2
am: 016ad16100

* commit '016ad16100694b829dec1c44aa06d65bf1c86eb7':
  Use alignas for alignment.

Change-Id: I34c786cac4cab920f4cf1269d3e0d721e0829fda