Merge "Revert "libutils: Introduce StaticString16"" am: d0e02d58d9 am: 2d26a252c4
am: 34a89e88e4

Change-Id: Iad389f55f227a99f861ea589a005de7485b6062e