Merge "Have setRelativeLayer take SurfaceControl instead of IBinder"