Merge "Wrap AHardwareBuffer_LockPlanes too." into main