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

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

Change-Id: Id1ecd0ac7fbe8427902eb78cd6118e63e56a86b9