Merge "The test now uses libarttest.so, so fails in ndebug mode."