Merge "ART: Update dex-file fallback code" into pi-dev