am 697c1c32: am 949e2a7c: am dfe747ad: Merge "ion: update struct and type definitions to match kernel header"

* commit '697c1c32cd405edcdbe3b8711c8cd02459e88353':
  ion: update struct and type definitions to match kernel header