Merge "Fix test with libarttest.so."
am: ddb9cda9a6

* commit 'ddb9cda9a6e97a2e1e50d3c299374d6053fc7ef7':
  Fix test with libarttest.so.

Change-Id: I38996679aaffe146a513055257ef3528550fcfeb