am 34ccd7af: Merge "Add missing includes for threads.h"

* commit '34ccd7af4216f571c2f88b32fea8bfed8ef0baab':
  Add missing includes for threads.h