Merge "Revert "delete toolbox/r.c""
am: 2f0c95a489

Change-Id: Ief95542d970a070d3877a6a660fea7c5e14dea00