g2: update product makefiles

Change-Id: Ibaf127172d1d66a8c52141d0cf1c7401425490ee