Merge "ion: update struct and type definitions to match kernel header"