Merge "Let header-abi-dumper get lookahead token from preprocessor" am: 4065033167
am: d73fb326dc

Change-Id: I4d95d5240c853b01a2ec57ecc96612da8b69f569