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

Change-Id: Ia3210a0442161a151df4a996775890723ab2ac41