Merge "Remove hard coding of ascii encoding when compiling SDK stubs"