Merge "rework GLSurfaceView so it can use the choreographer" into jb-mr2-dev