Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev
am: 42b3610adc

Change-Id: Ib1001156c0a68f695d755da51af5f0548ccbacba