Improved heuristic header substitution algorithm and unified it between
Add Include and Organize Includes commands.

Change-Id: I0d4a1110a8b89ca49d55eb82eddb29e7d8bcd548
4 files changed