Merge "gpu: ion: system_heap: add support for 2MB allocations"