Merge "Refactor flaky ArtDexFileLoader IsPlatformDex gtest" am: adff274917
am: 30437a7c3a

Change-Id: I8884363d3166b1a84d59bafb5907f90e9209dca5