Revert "remove speaker on config"

This reverts commit 0921f4b9abc5acce17f0dcb13d57c701753e9e2e.

Change-Id: I2184c32c73c1c9d3a12d78a03a3312e9cb627414
Merge "Revert "remove speaker on config"" into android-4.4