Merge "Remove extra cc_test options"