Change position of <model> and <format> tags in XML dumps.

Bug: 72417
Change-Id: I1d11ce8147cf0bf0018e3931202f533afd4ea93e