Merge "Revert "Fix test path in libarttest.mk""