Update to new ion API
Merge branch 'cm-10.2' of github.com:scoty755/android_kernel_htc_imnj into cm-10.2