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

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

Change-Id: I9913505b160be4c0bb8ae2bf1a3886c7ebde8d2e