Merge "Fix testExecuteShellCommand test in android.aadb" into marshmallow-cts-dev am: 782c7bd833 am: e64e871046 am: 7cc6683fe0 am: 3c9dc0a6f8 am: 631c665fa2
am: 46e49ee6d2

* commit '46e49ee6d246016b00348d64ff3a325f9b11de6a':
  Fix testExecuteShellCommand test in android.aadb