Merge "Allow patching between dex files in the boot classpath."