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

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