Merge "Revert "gralloc: Add asynchronous lock/unlock API""