Merge "SurfaceFlinger: remove DdmConnection" am: e55a64f1a7
am: 18b2d1b873

Change-Id: Icb3031dd2c5b534e4d986061435ad6a98c1b4963