Merge "surfaceflinger: Initialize Description field" am: 5fcdccab6f am: b9c594f32a
am: 50704e6d59  -s ours

Change-Id: Iaae91847702f7554710ad142652e0e20d81d855a