Merge "Clean up VideoView, SurfaceView constructors" into nyc-mr1-dev