Merge "Change XML-grammar for (Off)HostApduServices."