[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
am: 49c83090d1

Change-Id: Ia8e6c07031687325c5e636815b0a21983337fd53