am e610a1e: AI 147559: CTS: Use longer timeouts to allow for class initi

Merge commit 'e610a1e958b9b9b2bf6d2f3d87aff38fd9e056a8' into donut

* commit 'e610a1e958b9b9b2bf6d2f3d87aff38fd9e056a8':
  AI 147559: CTS: Use longer timeouts to allow for class initialization delays
tree: 4f33abf8fdd73a1bd27396420bc2733b953ff44b
  1. tests/
  2. tools/
  3. Android.mk