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

Change-Id: Ibc166a573e07abef5bb05df3fed5332ccafc7e4f