Merge "delete toolbox/r.c" am: 08f0c4c998
am: 604ed83934

Change-Id: I501fbb275af584fdc60bfde9c3b13cc75c3d6f27