Merge "adb: fix GetFeatureSet() to indicate failure." am: 921b8e19ee
am: ff81cd2727

* commit 'ff81cd2727a8abbbad7754ffdbea5783120769e7':
  adb: fix GetFeatureSet() to indicate failure.