Merge "dumpstate: call printflags instead of reading flag files explicitly" into main