Merge "Polish the lock contention logging." into dalvik-dev