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

Change-Id: I2f6a9ef345301216b2e77ddf5183ff3939bc29ab