Merge "Add missing ThreadDefs.h header" am: 2362edf7a6 am: ddb3fb53c7

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2017407

Change-Id: I6605a7b738af1615f11768ecdcb8ae73a7c66fab