diff --git a/android/avd/info.c b/android/avd/info.c
index 29ff1db..6e97703 100644
--- a/android/avd/info.c
+++ b/android/avd/info.c
@@ -898,13 +898,12 @@
 
     _avdInfo_extractBuildProperties(i);
 
-    /* TODO: find a way to provide better information from the build files */
     i->deviceName = ASTRDUP("<build>");
 
-    /* There is no config.ini in the build */
-    i->configIni = NULL;
-
-    if (_avdInfo_getCoreHwIniPath(i, i->androidOut) < 0 )
+    /* out/target/product/<name>/config.ini, if exists, provide configuration
+     * from build files. */
+    if (_avdInfo_getConfigIni(i) < 0 ||
+        _avdInfo_getCoreHwIniPath(i, i->androidOut) < 0)
         goto FAIL;
 
     /* Read the build skin's hardware.ini, if any */