Update ion header

and fix the build breakages after the update

Change-Id: I964a63618a12678caec18789d1e3b23321aff96a