UPSTREAM: locking: avoid passing around 'thread_info' in mutex debugging code am: 286f536cbf
am: fa4efa16cd

Change-Id: I9ec3beb4ffbf1a6625358890cb574cf2ea652761