Merge "Adjust in-memory dex loading logic when backed by oat"
am: 525fb7f2da

Change-Id: I6f25a6b8c1144c4424fecb9f4d17e4f9f70dd925