Bug 485422 - Organize includes: header substitution maps not always used

With this change the heuristic header substitution tries to find a
header that is better than the one computed using regular substitution
rules, but defaults to that header if it can't find a better one.

Change-Id: I811857b2ccf66e2db4161801f34db8464834ce12
3 files changed