Merge "Clean up the GraphicBuffer." am: 9a034e45b0

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16829633

Change-Id: Id2a69f7062256d4b17527701687d00863ec7fd33