Use frozen copy of ion.h for this code. am: 550aee8200
am: fa2a16e707

Change-Id: Iff2d0ced4ebd153e06a8aa62af6a1fbaf7858ddd