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

* commit 'dbb39017486cb2e9c52557dc9e1f3a222786e2a5':
  rework GLSurfaceView so it can use the choreographer