Merge "Revert "locking/spinlock/debug: Remove spinlock lockup detection code""