Use frozen copy of ion.h for this code.
am: 8712cbc785

Change-Id: Ia6fac704fb280832ea33dceafc52c7bbeb30393c