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

* commit '9d5a96c0d9583fe9a02190ba54a855a2dcc87eb9':
  Clean up warnings in stubs.cpp.