Merge "Add SDK extension versions to dumpstate header"