Merge "lpmake: Don't assume a device is retrofit if it has one block device for super."