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

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