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

Change-Id: I19cc3f14285b9fc37c75d545947195dc114781e6