Fixup for upstream adreno changes