am d1d11fcb: Merge "Build the optional \'r\' tool separately."

* commit 'd1d11fcbe55ed7c7d49e857565fb2ec06ad5b54c':
  Build the optional 'r' tool separately.