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

Change-Id: If0ec0d7f032f40961117509fca8c06cbc20cffe7