configstore-utils: vendor_available
am: 632579d979  -s ours

Change-Id: I2e05066b5e95a7abf46e17ac1a658775f5f7d366