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

Change-Id: Ic48c28b213f012b2829cccbc1fc121f2f573dbb1