Merge "fastbootd: Support two super partitions for retrofit devices." am: 66a6d8877c
am: 0160700fd7

Change-Id: I402e78a1394fb691d224c8cfe28076aa2f37f899