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

Change-Id: I02835611f7662f3f7e3c13786d6db60ca1af4062