Merge "Undefine TO_ENTRY_POINT macro after consumption"