Merge "gralloc: Move getAllocator in unlock"