Merge changes I99d46a2c,I6ff460d0

* changes:
  Skip logical partitions in non-AVB2 case too
  Allow non-A/B, non-retrofit devices to override super_partition