Merge "Remove extra cc_test options"
am: b34755199f

* commit 'b34755199f961f613ff8e0976ee3574c237a7a64':
  Remove extra cc_test options