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

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