Merge "init: do not impose vendor_init restrictions on old vendor images"
am: 4396bb85da

Change-Id: I44a5053dab8133b7786d1f261bd17df0a12eb55b