Update device.mk to target vzw-g2.mk

This gets rid of incall echo for vs980
Change-Id: I179f16e403534120b9781d00aad482876ddbb364
Revert "Update device.mk to target vzw-g2.mk"

This reverts commit 76ace67ded2cc31ad38561bbb4509540eb19b32f.

Change-Id: I1d84cff51c41da6d3b6637fab93a96a8a43872ed
Merge remote-tracking branch 'slim/kk4.4' into ose