Merge "Fix test path in libarttest.mk" am: 777d18bc40
am: b73e2d6586

* commit 'b73e2d6586373a330b9d5a9260381c499a3122f2':
  Fix test path in libarttest.mk