Merge "Fix the definition of THREAD_CURRENT_IBASE_OFFSET."