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

Change-Id: I915d83f550a27da7792284edab78c86812fadb3f