am 7a06798: AI 148171: CTS: Fix failing test cases in Android test plan

Merge commit '7a06798806a656c5fbffd496a3606ecb1658b86f' into donut

* commit '7a06798806a656c5fbffd496a3606ecb1658b86f':
  AI 148171: CTS: Fix failing test cases in Android test plan
tree: 5bf222afe164ef59c5174c8adbcb0868e9651f7a
  1. tests/
  2. tools/
  3. Android.mk