Use frozen copy of ion.h for this code. am: 34bb282eb4 Change-Id: I17324f2ce0ae4c2ef0794f7f0bd3dc1b181a7407