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

Change-Id: I37fcf9271150db9f1eafcbdc50fc4ef1a3727486