Fix test breakage

This CL also adds null analysis annotations to StringUtils.

Change-Id: I751932c1ed2579bc10f4584651b997356f180899
3 files changed