Merge "Remove hard coding of ascii encoding when compiling SDK stubs"
am: 00bc4acbd9

Change-Id: Ifa4977e4b4c2ecafef766b909f0d47606129ccf8