Merge "Minor build-outside-android fixes" into main am: 43571dd2 am: dda7686e am: 8ff6f889

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



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