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

Change-Id: I9710424d7544bcdf9a3e09f452993f747a1b6c05