Merge "Minor build-outside-android fixes" into main am: 43571dd2 am: 7d658504 am: 35c7edbc

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



Change-Id: Icb95b9c67a16e197fa4b9990d060409418ea10d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>