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

Change-Id: Ife847178f6bd837f875ce59ae0cc959e278275a0