Revert "am bd20e551: Merge "Use asynchronous lock/unlock API""

This reverts commit c1ffd351bc44483369271c11dd4c6391bba8c64c, reversing
changes made to 9eb142e34a5bc11508c0bd6f60ad3933c60aa530.