Merge "Support running run-test in ndebug mode through make."