Support merging device info metrics.

Add support to read in previous device metrics from XML, and add logic to
combine values. ie when running on multiple devices, we want the report to
show: serial1,serial2 etc

Also cleanup a few constants for consistency.

Bug 5171702

Change-Id: I53a1d82b78fde7795f72015c289baa28c7b8472e