am b80e229d: am 66f2af4e: am 6c432940: am dcdc985c: Merge "executable_prefer_symlink: add makefile for creating symlink to prefer version"

* commit 'b80e229d7642e7730628d09cf2085ed093e3df6c':
  executable_prefer_symlink: add makefile for creating symlink to prefer version