Reorganize config file

Change-Id: I8f39652a96be9cfa92f8952c83040fd9545a6afd
Add FauxSound control 3.2

Change-Id: Ie2883b3678b8dbf276e51a9ee1aab3271f52c11a