Merge "Add a command line option to dump function declarations"