Merge "ART: Update dex-file fallback code"