Use frozen copy of ion.h for this code. am: 35ffe308d2 am: 8357b3ccb7
am: decfd6003f

Change-Id: I91862a0b19020ad0689aeb679db850d2a6127d45