Merge c1f928f5da669708d256694c98be186cb0ca8ad8 on remote branch

Change-Id: Ie7bca96fb4df5a00044c4181ad5245540c465128
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
old mode 100644
new mode 100755