Merge changes from topics "extdir", "threadvars" am: d2149e6a81 am: df4ea086a4

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1988355

Change-Id: I58af0d0e5e70cefc18a4867f8088454588f14d9c