Merge "Adjust in-memory dex loading logic when backed by oat"