Merge "surfaceflinger: Initialize Description field" am: 5fcdccab6f
am: b9c594f32a

Change-Id: I6f72e12d2aa92a1abcca24f5f531e45dde9f435a