Merge "gralloc4: update lock support"