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

Change-Id: I10a988bc57938008178d645449e529f8c5312c69