Merge "Update FlexLinker.h to current version of flex." am: 887e2d99a5
am: 389e648f59

Change-Id: Ic05f622353ddec484af367576df45a5e94a280a3