Update Makefile for cross_compile flag
Fix conflicts for defconfig on VZW