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

Change-Id: If9b9ee3fd3f42296a86cbbd20f0c1a3f48989a89