Merge "Triple buffer SurfaceFlinger" into jb-mr1-dev