am 21fb6343: Merge "as a debug option SrufaceFlinger can now connect to DDMS"

* commit '21fb6343ce079c23502b6969019d6b8795c47eb5':
  as a debug option SrufaceFlinger can now connect to DDMS