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

Change-Id: I2725b81599d2b90473a96e0748911ca3bbf46211