Merge "Remove Test Annotation Related Tools" into gingerbread