Merge "surfaceflinger / GL extensions cleanup" into gingerbread