am e7584a7d: Merge "Remove Test Annotation Related Tools" into gingerbread

* commit 'e7584a7d011324395d1ea0d3ba23d261af069337':
  Remove Test Annotation Related Tools