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

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