Prefer 'html+tidy' to 'html' if both are present on a parser test.

Change-Id: I7a35450133034a35cd2c292c0c473d8650c148ac
Merge "Prefer 'html+tidy' to 'html' if both are present on a parser test."