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

Change-Id: I0b3cc5b615192354a1da62635452fda72a4615cb