Merge "Make shell bugreport file names consistent with dumpstate"