Merge "libgui/SurfaceFlinger: Add getConsumerName"