Merge "Mac build fix" am: fb7eb3f8ed am: c8542eb37b

Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/1978006

Change-Id: Ibd2253d6eecb49bc0575ec937fff3cd221928d19