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

Change-Id: Ie2f8755ecf548a50664a999f3e090e5d51018f12