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

Change-Id: I2a59eb8b76b5106f6696d05a9e9181489399ddc3


Trivial merge