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

Change-Id: I0830d652878b79d352fc6a5cdcf695ff8089a37b