Merge "Update unit tests for -dump-function-declarations" am: 376b57580e am: e9c44e6e98
am: eec010ccfb

Change-Id: I406644123bf440ae5ebd60d54d43d3041a4e4a10