Merge "ART: Fix preloaded dex cache expectations"
am: f6e11e9e21

Change-Id: If4f639020819adb01634cf1c759fd9e6e15dbdde