extra-files: merge as.xml from package xbianhome.

This also removes a number of unchanged defaults.