Merge "Fix test with libarttest.so."