Actually make resources work from vendor

Change-Id: Iaa6e344ea897a9a399dee7d4618389ce176c97b4
Merge "Actually make resources work from vendor"