[automerger] Merge "Add ability to include test report summary html report in the zip file. File is included if the flag '--html-in-zip' is present." into oc-dev am: 491ff8a133 am: 90b3bdbe36

Change-Id: Ic84858a08c921ad9f196958c747d5ba514bc328c