Revert "Tweak order of tags (again)."

This reverts commit 46f1affff52964c18bb0cbb9380c20c6862af493.
Not needed.
Correct way of setting the VERSION.
Must merge the values to avoid overwriting the property values.
@todo
Fix procid assignment.
Another @todo
Simplify.
Simplify.
Save the multiplex value.
Default to empty array.
Not all android devices use Android as the deviceType.

Sniff on the OS, if available as well.
Default multiplex value to 0.
No harm in checking for this, regardless of EAS version.

Avoids more errors with broken clients.
Log these errors.
Need to set the first AnnouncedVersion here also.
Create the entry if it's not already present.

Fixes version information not being available for the initial PROVISION command.
Simplify.
Always make sure we save the entire device object first.