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

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

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