am 4504fe84: am 7b0c952a: Merge "Revert "Added C++11 flag to RS support.""

* commit '4504fe849745d7a7a373ebc363534eb81f254f66':
  Revert "Added C++11 flag to RS support."