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

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