Merge "Remove unused dependencies in SurfaceFlinger" into rvc-dev am: c30ebd0188

Change-Id: Iaad865a9c4630a08e59b32b44aa13db8609d49bc