Merge "gralloc_gbm: fix gralloc_gbm_bo_lock() declaration"