Merge "Adjust ResolveRelativeEncodedDexLocation."
am: 4e29bda89b

Change-Id: I80f3e6325551832c861a9ea5c0e1a0c4a289facd