Merge "ART: Fix addr2line call"