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

Change-Id: I8d13e597b8e0dee27939ee4cc48c6bd75effe797