am 89b7a104: Merge "Add missing includes for threads.h"

* commit '89b7a104d41c1ecbc1319a3d47199d40d56ebc96':
  Add missing includes for threads.h