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

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

Change-Id: Ie2970514e18d884fd09493e027f49700dcbcb95f