Merge "Minor cleanup in gralloc" am: cb53ef7cd9

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

Change-Id: If89c3dc973e3adaa4f33ee48949926adce53cc0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>