Merge "gralloc: Fix gralloc protected allocations"