Revert "ion: Bring ion header in sync with jb_2.5 userspace [JB_MR1_CHOCOLATE]"

This reverts commit 8aed6c088320a80a7391dff071250a2eda7e6933.