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

Change-Id: I89c75f29a12470b2369c8795a9e674eed31a3018