Fix string deduplication for multi-image extensions. am: f4ba904ec0

Change-Id: I95409307ad0565a847b3ed8ae0d7dea05531d718