am 574773b1: Merge "Clean up warnings in stubs.cpp."

* commit '574773b1eae797e2f7a1d11d0176755d2e74eb41':
  Clean up warnings in stubs.cpp.