Merge "Revert "Fix test path in libarttest.mk"" am: 57989d6f72 am: d378028bea
am: 07474561b4

* commit '07474561b4092ff5ec201587df9e51d01d5de568':
  Revert "Fix test path in libarttest.mk"