am e0e5790: AI 148153: CTS: Strip control characters from failure string

Merge commit 'e0e579051414248e1b74fbfe5029d07b7edcd456' into donut

* commit 'e0e579051414248e1b74fbfe5029d07b7edcd456':
  AI 148153: CTS: Strip control characters from failure strings before converting to XML
tree: 8b15730f225bc8bffac54bf1140cc3a7df3e6d5a
  1. tests/
  2. tools/
  3. Android.mk