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

Change-Id: I6201601cca33fdde4b982fab7cb8bba8d4c6eaf5