Merge "ART: Fix preloaded dex cache expectations" into oc-dev