am 4ff65a0b: (-s ours) am d6f3d00b: am d7978a28: am 34ccd7af: Merge "Add missing includes for threads.h"

* commit '4ff65a0b9390f2a72306d4440da102fc666d69fb':
  Add missing includes for threads.h