Merge "Align properly in BufferItem::getFlattenedSize."