[analyzer] Slightly clean up the fix in 138432, so that it doesn't depend on...

[analyzer] Slightly clean up the fix in 138432, so that it doesn't depend on the relative ordering of path-sensitive and path-insensitive checks. Still not ideal, but I think a real fix would require infrastructure that doesn't exist yet.

llvm-svn: 138462