Merge "Attempt to fix mac build" into sc-v2-dev am: 6ef88d4fd2

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

Change-Id: I9a1443487befdaf4e99331c7efb917327652aa8d