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

* commit '61b4b8095a4de1e4d8ea27f860c32ea345b37bfa':
  Build the optional 'r' tool separately.