Merge "Add --class and --method options to cts tradefed." into honeycomb