Merge "Precondition VINTF file collection relies on android.os.VintfObject"
am: 824d99779c

Change-Id: Ie7090c18ed6f7f15bb788b024c1048451ce7f403