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

Change-Id: I83c4a2e592b7385b1aa6dc3157bd6ea5950c624a