Improve the formatting of several XML files of arch-design

Change-Id: I033c34ab6fe17602155e6a7f8d5bdac9a41bbbfa
Merge "Improve the formatting of several XML files of arch-design"