Build fix am: 5c653761db am: c95ad72f80 am: bf03460754

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

Change-Id: Ib259b3d73d242b5c0bec022074e7ffffd900a975