Revert "Virtual devices with phone caps don't need to overlay config.xml values"

This reverts commit 650359df6246b3baaa70770f7e1909803b9d9159.