Merge "Refactor flaky ArtDexFileLoader IsPlatformDex gtest"
am: adff274917

Change-Id: Ic14f5c4aad71aeda02cc9896f4fe0e94bb8e32a0