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

Change-Id: I9df8de483934030db971788ba33a8b96a1c7abac