x11: Call XInitThreads() am: 5d11c9d2c0 am: 0fe4efcfa8
authorChad Versace <chadversary@google.com>
Mon, 23 Jan 2017 19:37:48 +0000 (19:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 19:37:48 +0000 (19:37 +0000)
am: 8c04df2e48

Change-Id: Iec487e77848eb572b190561d836bf2a903f84820


Trivial merge