Merge "gralloc: Change private usage flags from enums to defines"