Merge "gralloc_gbm: fix gralloc_gbm_bo_lock() declaration" am: a7f5619ed2

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1345436

Change-Id: I89c717a53e73cd37c82f1946734c65cd591ae139