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

Change-Id: I0eeb4aa44ae0ee2072da9b6b5cad173f7009d9b0