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

Change-Id: I51daef2aa4f6e2ab95437df841c3ff8dea2ab8b2