am 698c04c: AI 148525: CTS: Rerun currently running test when batch mode

Merge commit '698c04cca376dc073be4ba7ee752b24bb6966c47' into donut

* commit '698c04cca376dc073be4ba7ee752b24bb6966c47':
  AI 148525: CTS: Rerun currently running test when batch mode terminates abruptly
tree: 5d6bd3476007a9bf9bbe8f4df53b3f41787463a1
  1. tests/
  2. tools/
  3. Android.mk