Merge "[SurfaceFlinger] Allow root to capture screen." into qt-dev am: 273d261d70
am: 100f2e4dc7

Change-Id: Iddbc72f360de2f4836cfa6bc5d019e5a289a423f