Merge \"Fix the definition of THREAD_CURRENT_IBASE_OFFSET.\"
am: 5f485719b1

Change-Id: I826e160196ec939d5c913dab8ededb50253929c3