Merge "libavb: Only query partition GUIDs when the cmdline needs them."