Merge "Moved 'bugreportplus' from init.rc to dumpstate.rc"