Merge "Dump /proc/bootconfig in dumpstate"