Merge "Retire hwc2" am: cd234b5e05

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

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