Merge "Adjust ResolveRelativeEncodedDexLocation."