Merge "allow dumpstate to collect ro.boottime.*"