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

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

Change-Id: I658fa5b991b6384037ef16826f4b0cae1e9b824a