Merge \\\\"Fix the definition of THREAD_CURRENT_IBASE_OFFSET.\\\\" am: 5f485719 am: 2576d622 am: f71b8872 am: b64d909c Change-Id: I4cb8304ec7d75d3c73573a000b2fa04fa600068d