Merge "Let header-abi-dumper get lookahead token from preprocessor"