Merge "Fix pc/function name for signal handler frame." am: a853a2f8ec
am: 06a973da24

Change-Id: I20cdaf32e483379fd60d82b44584d6299f811ad9