More xml fixes

subdir elements now have their names quoteattr

Change-Id: I37faf164e339deacb6555db94196135debe22a6c
Merge "More xml fixes"
Merge remote-tracking branch 'upstream/master'