Merge "AOSP master doesn\'t have "cmd"."

am: 54b5e85373

* commit '54b5e85373619a838641d276a840caad284b09b3':
  AOSP master doesn't have "cmd".

adb/transport.cpp

@@ -784,7 +784,9 @@ const FeatureSet& supported_features() {
     // Local static allocation to avoid global non-POD variables.
     static const FeatureSet* features = new FeatureSet{
         kFeatureShell2,
-        kFeatureCmd
+        // Internal master has 'cmd'. AOSP master doesn't.
+        // kFeatureCmd
+
         // Increment ADB_SERVER_VERSION whenever the feature list changes to
         // make sure that the adb client and server features stay in sync
         // (http://b/24370690).