Merge "merge "SDK: make 'mkstub' less verbose." from HC. Do not merge." into gingerbread