Merge "add annotation support for instrumentation based test in cts."