[PATCH 0/2] Tweak addr2line function names