am 3dc7ef42: (-s ours) am bb0f61d7: (-s ours) am 5eafc91a: Merge "merge "SDK: make \'mkstub\' less verbose." from HC. Do not merge." into gingerbread

* commit '3dc7ef4243e43c3c9c7dac7f45f515aa8f8f28b6':
  merge "SDK: make 'mkstub' less verbose." from HC. Do not merge.