Merge "Minor build-outside-android fixes" into main