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

Change-Id: I06a215ba57ffaa6e29e4824b4cbe185776bd2115