Merge "gralloc1: Changes to align to new ion api requirements" into display.lnx.5.0