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

Change-Id: I9afbf0c1bfc732b6e4647970d5efa20c1b4c0c3b