Merge "AOSP master doesn\'t have "cmd"."
am: 54b5e85373

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