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

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

Change-Id: I774010bf82b9c6eb7b8d666f6c5a5a62b9779753