device = DEVICE

Change-Id: I5fa42c62b2a374588a25799fcfa3be9d7b7b2486
Merge "device = DEVICE" into kitkat