Merge "libutils: remove whitespaces in String16.cpp and String16.h"