Revert "Add vzw-g2.mk"

This reverts commit 33a81b32cc6e9982aee9ba9546a90d2db255c547.

Change-Id: Ic46efcc223dfb77d92054d1792239f49016099dc
Fix incall echo for vs980

This is a cleaner way to fix the echo

credits: jakew02
Change-Id: I0b011f690ebaf68e9b3b585b40462d07477354a0