Merge "Fix sw legacy compat path in SurfaceView" into nyc-dev