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

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