x11: Fix deadlock
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 19:12:10 +0000 (19:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:12:10 +0000 (19:12 +0000)
am: 5e863331b2

Change-Id: Ic938e269f89e59fc9ab8b43c97efcb49e0317180


Trivial merge