Merge "Add const specifier to SortLayersByZ comparator"
am: 42ea1de680

Change-Id: Ibce202b9ba4f96314d2d6264edae0a462c502fb6