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

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