Merge "Revert "Reland "libutils: Introduce StaticString16"""" am: c9cddde018
am: b669307517

Change-Id: I5e987d4279842a61305cd49b9b54d92bfb1d5c94