Merge "Minor makefile tweak to compile with elfutils-0.138"