am 26ad3929: am e755bd40: add /vendor support

Merge commit '26ad39290948f7728b613208e5b8dc311029ebfe'

* commit '26ad39290948f7728b613208e5b8dc311029ebfe':
  add /vendor support