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