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

Change-Id: Idc4d89054b51a8577d5e13da9c90a464a8305b1b