Fix merge with smallvector in llvm

Change-Id: I2e544f4e09a075721ae16567336234beb06967d6