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

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