Merge 256b3215d71cddabba8d2ae37f745f3ddbff5c6b on remote branch

Change-Id: Icc2c30b81c463a9a38b070a1527c507928749bdc
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index ceee034..bc2ed90 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2266,6 +2266,9 @@
             break;
         }
     }
+#ifdef PASS_COMPOSITOR_PID
+    mDisplayExtnIntf->SendCompositorPid();
+#endif
 }
 
 void SurfaceFlinger::onMessageInvalidate(nsecs_t expectedVSyncTime) {