am d5fe3a6: AI 147757: CTS: Increase test timeout and fix result mixups 

Merge commit 'd5fe3a6913a9fa68a8f4ce44507bcd104ae64cc7' into donut

* commit 'd5fe3a6913a9fa68a8f4ce44507bcd104ae64cc7':
  AI 147757: CTS: Increase test timeout and fix result mixups after batch timeout
tree: 169a1f684a574aca045ae029a4a261a2cdb9040c
  1. tests/
  2. tools/
  3. Android.mk