Use frozen copy of ion.h for this code. am: ad2a78606b am: 627667649b
am: 44c0ce2d4b

Change-Id: I6ad3bdd5c5c0bc836e07100ee230f144f6418c01