Merge pull request #6697 from cotequeiroz/libmraa_swig_dir