Merge "Added support for patching classes from different dex files."