vendor-data minor format / style cleanups

This just adds a couple minor style and formatting cleanups to the
vendordata code.

Change-Id: I440689a51db98d4aaa581c45dba1660488355da3
Merge "vendor-data minor format / style cleanups"