Merge "Use dumpstate directly for bugreports." into jb-mr2-dev