Merge "Tidy up DexLoggerIntegrationTests."