Merge "Add const specifier to SortLayersByZ comparator" am: 40f0088f45 am: f2995e72f4
am: 221869c797  -s ours

Change-Id: Ied0cdd6d215d76160418eb32913081d4b1611dba