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

Change-Id: I0e7e745d2231e306c997c061049132f508cfc40c