Merge "ion: Update ION_SECURE and ION_FORCE_CONTIGUOUS flags"