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

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

Change-Id: Ie4da719b92f1137e8d8c957ea907ae20f9850803