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

* commit '7b0c952a611acb938b5e17f81f74a7d85f730332':
  Revert "Added C++11 flag to RS support."