am ada6de67: (-s ours) am a1821f01: Merge "Regenerate msm_ion.h."

# Via Android Git Automerger (1) and others
* commit 'ada6de673be2a66bcfa822e0bb895219391c22a8':
  Regenerate msm_ion.h.