Merge "Fix test path in libarttest.mk"