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

Change-Id: I4023510ce2ab7bd51d2f2f7e2a1ffb311c26d17d