Merge "Fix the build-art-multi-executable Make function."