Merge "ART: Fix sharpening across dex files"