Merge "fastbootd: Support two super partitions for retrofit devices."