Merge "Merge \"update GlSurfaceView:onPause/Resume docs\" into nyc-mr1-dev am: ee557b2b99" into nyc-mr1-dev-plus-aosp