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

Change-Id: I405f154ba371488182a2dd5ca16923a694263e4a