Merge "surfaceflinger: fix z type in LayerVector::do_compare"