allow raw XML to be passed to --hostrequire

Bug: 1014693
Change-Id: I20c7f5d94a2d73eb6dae88da437cf152152104d3
Merge branch 'release-0.16' into develop