Merge "Mac build fix" am: fb7eb3f8ed

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

Change-Id: Ic2b1997217243932b5f5dc01de26b56e82b8bd6a