Merge "kernel-image-check: replace --short-locs with sed postprocessing"