Merge "Avoid an extra copy for RGBA layers" am: c3cdb991af

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

Change-Id: I69d45121200a3bdc95bbfd67f72f2df5b09bf252