Use frozen copy of ion.h for this code. am: 550aee8200 am: fa2a16e707 am: 15d847b9d5
am: ce8a6d7de7

Change-Id: Id8ebc5521bf4995d7222f3f749f08db210764aad