Merge change 21366 into donut

* changes:
  CTS: Python script to replace the description and plan generator
tree: 0c18adce0e9d89cf801a96882d66ff259705d923
  1. tests/
  2. tools/
  3. .gitignore
  4. Android.mk