Merge "Fixed bug in debugging information in dex file"