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

Change-Id: Iae536a2eaef715a899bd97ccf1645541a520376f