Merge "Add const specifier to SortLayersByZ comparator"
am: 40f0088f45

Change-Id: Ia7316e218e388b6f3760374751b32bb992c6441a