Merge "Build the optional 'r' tool separately."