Merge "Add glFlush in surfaceflinger screenshot code." into lmp-mr1-dev