LockWatch: Update to Mutex::timeLock specs am: 51a6319111
am: 7b960a5dc5

Change-Id: I8ac07ecca362a819ead34c6f7f2dbeb75d9cbd1c