Adjust device info constants for consistency.

Attempt to use the same attribute values in all three places they are defined.
Remove attributes not being referenced in current XML.

Change-Id: I3046a16b50e2c3ca3fb273d789007fe7fc294870
2 files changed