Merge "dumpstate: zip bugreport when bugreportwear is in the extra_options."