Merge "x11: Call XInitThreads()" into nougat-cts-dev
am: cbdbf95222

Change-Id: I2531e5a260f50c8bae1a756a61026a46ae253614