am 617f18e: AI 148198: CTS: Fix or exclude failing tests in Android test

Merge commit '617f18ef6aeb9fc3e520019a85c0748917d2bd0f' into donut

* commit '617f18ef6aeb9fc3e520019a85c0748917d2bd0f':
  AI 148198: CTS: Fix or exclude failing tests in Android test plan
tree: 4707baa089a5af0fd876f202381215992f572989
  1. tests/
  2. tools/
  3. Android.mk