Merge "surfaceflinger: Generate unique layer names" into oc-dev