Merge "Add a command line option to dump function declarations" am: 508383c403 am: 8a01a00c99
am: 1581a39521

Change-Id: Idcd7f819b090dcacf9e177da68f61d75a7bc4e30