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

Change-Id: Ib55339d168808e2593748efe1aea573a56b3beb5