Merge "Encode function signatures properly in DWARF." am: b9ededb3b5 am: 8b16222448
am: d8511f44cb

* commit 'd8511f44cb868905dd1d52b9ad4624abacde4835':