am fd9017e8: am 10cb68fb: Merge "fix BufferItem flatten/unflatten alignment"

* commit 'fd9017e8db29f2d87b70034bbb57ef1c424fa2b6':
  fix BufferItem flatten/unflatten alignment