Merge "ion_test.c: Fix c/p error in arg parse." am: f51886bbc4 am: 23da76e246
am: a9a084c662

Change-Id: I2bc2ba6b34958bcd18afb7470a0f86db1ab0e47d