Merge changes Id8848530,I9331f202

* changes:
  FTL: Add SmallMap<K, V, N>
  FTL: Generalize StaticVector in-place construction