Clean up vendor image handling - DO NOT MERGE am: baacc3a7e8 am: 5183cdc3ac am: fc143d474e
am: 67efcb12b8  -s ours

Change-Id: I4895e7595b3eebcc99097642f9f5f7708261f355