am aa6c8994: am b66bc514: Merge "Clean up warnings in stubs.cpp."

* commit 'aa6c8994b7c40ea637d60fa4413928e62b5d814a':
  Clean up warnings in stubs.cpp.