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

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

Change-Id: I504173dc667c5bb8d17bbcefaa1fb56f5326821b