Merge "Don't assume an A/B device when overriding the super partition name."
am: 8f37d23faf

Change-Id: I6deea49e698bfc1ca40f3ea622c9ecc63f02cd3a