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

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