GPII-120 putting development configs back the way they were. Fixing android device listing file name to match conventions from other platforms.