Merge "Fix libarttest to be non debug"