Merge "gralloc: update lock and lockYCbCr"