Clean up vendor image handling - DO NOT MERGE am: baacc3a7e8 am: 5183cdc3ac
am: fc143d474e

Change-Id: I40ff11d3eab955f2cd5983d4e3bb9da5add99fdd