Add a bunch more detail to --device-metadata output, from fields we weren't formerly using in the output.

Add a bunch more detail to --device-metadata output, from fields we weren't formerly using in the output. #1622