Merge "Remove extra cc_test options" am: b34755199f
am: d370feffd6

* commit 'd370feffd6b9f0d8df8f222d9c22dd32cce5532b':
  Remove extra cc_test options