Merge "adb: fix GetFeatureSet() to indicate failure."