Merge "Revert "Revert "Move back to the previous version of ion.h.""" am:...
Merge "Revert "Revert "Move back to the previous version of ion.h.""" am: 5dde3e4d am: 74828960 am: f422c366
am: c164e988
Change-Id: I91fcd72bfd0219f9cdf7e274da9a98fb54258714