remove PRODUCT_DEVICE

Change-Id: Idca6e226e890726dadc18a15caa305cf3af59e9b