am 9486cad8: am cf56b9f0: Merge "Switch rsg-generator-support to use no STL, since it is pure C."

* commit '9486cad8ed82e746a0dc2dbb4093973d8c4882ae':
  Switch rsg-generator-support to use no STL, since it is pure C.