Merge "adb: fix feature sets on devices that don't have them."