am 2b9301bf: Merge "ART: Fix sharpening across dex files"

* commit '2b9301bf26c9c2629cc595cdb1433dea77b00a94':
  ART: Fix sharpening across dex files