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

Change-Id: I408d6f2d31a0893f43e1df065d0e1114a8fbc758