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

Change-Id: I135bd2f1be9bc791f7606a8b932de62cd16550e8