Use frozen copy of ion.h for this code. am: 8712cbc785 am: b8af65f514 am: 4f71df5045 Change-Id: Ie0d052632bd29eb8872e77f9aa56d8960f7556c1