Merge "Fix the build-art-multi-executable Make function." am: a10a0750cf
am: fc41516ef5

* commit 'fc41516ef5198b14aeb0fe9a85f7b4e7c842b5ef':
  Fix the build-art-multi-executable Make function.