Merge "Fix pbo size" into tm-dev am: 3cbe82bf07 am: d06e6b8919

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

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