Merge "ion: Change ION_SECURE to ION_FLAG_SECURE"