Merge "ART: Fix prefix issues in Addr2line dump"