Merge "Update unit tests for -dump-function-declarations"