Merge "Fix clang static analyzer warning in libcore"
am: f071994510

Change-Id: I73f65caff0c19b8e35b6e785b294e29a8bfddc3c