Merge "[ATest] Change info cache root dir"
diff --git a/atest/atest_utils.py b/atest/atest_utils.py
index 91f2026..edd864c 100644
--- a/atest/atest_utils.py
+++ b/atest/atest_utils.py
@@ -57,8 +57,10 @@
                                               os.getcwd()),
                                'tools/tradefederation/core/atest/test_data',
                                'test_commands.json')
+BUILD_TOP_HASH = hashlib.md5(os.environ.get(constants.ANDROID_BUILD_TOP, '').
+                             encode()).hexdigest()
 TEST_INFO_CACHE_ROOT = os.path.join(os.path.expanduser('~'), '.atest',
-                                    'info_cache')
+                                    'info_cache', BUILD_TOP_HASH[:8])
 _DEFAULT_TERMINAL_WIDTH = 80
 _BUILD_CMD = 'build/soong/soong_ui.bash'