gpu: sync with flo lollipop release branch