Merge "toolbox: make "r" available for /vendor" am: bc6372103a
am: 05e32cf544

Change-Id: I4dc11fe9963e6fa1b9395e8dfa6f38ef2d836d5a