am 4c2aec09: am aa3e17e1: Merge "Return path including executable instead of without"

* commit '4c2aec09cf2da437f3995ff4cac87e4c20d1d4b0':
  Return path including executable instead of without