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

Change-Id: I5264132fcca7683c196322e103f5b00fb4584848