fix broken things in mkhtml

Change-Id: Ifb9aa694eddd4bffe457674265a2b17093182c50
Merge "fix broken things in mkhtml" into release-4-6