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

* commit '40ed32ae3eaee093a7abfd9c43aafde5f0719eb8':
  Fix test path in libarttest.mk