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

Change-Id: Idc33f0023c239808139d32cae21183a60fe2e791