Merge "Trivial strxfrm coverage improvement." am: 6900a09fe7 am: 1caae5f7f5 am: b0cef76f70 am: 661352235d am: cd3169e02d

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1393618

Change-Id: If2cc372ad0fbef0406150dd8af7754fc34d8fd8f