Merge "Minor build-outside-android fixes" into main am: 43571dd2ef am: 7d65850413

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

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