Remove duplicate entry in device-common.mk and fix PRODUCT_NAME

Change-Id: I8b8425283a07b162eed85004b3746a4934e47c74