Merge "add private field in ion_heap and ion_platform_heap structure"