Merge "libgralloc: Add support to use CAMERA_HEAP"