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

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