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

* commit 'd6f3d00b602c16fe4f67932d8f6b47f42fa9bf73':
  Add missing includes for threads.h