Merge "Clean up global g*FormatStrings." am: fa5d4b2395

Original change: https://android-review.googlesource.com/c/platform/system/libvintf/+/1912640

Change-Id: I6efd2ea72e6c1302caab70cc1baa7086e8695a0a