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

* commit 'b45c910850640ed7ffcd0f6744992ca7dc335c2c':