Merge pull request #447 from pedroigor/master

[PLINK-649] - Add jandex to the build.