Strip Unicode : Fix compilation warnings

Change-Id: I0b9d7e21606df70dc3e8e7d8cb0c8ee31704c6c4
Merge "Strip Unicode : Fix compilation warnings" into gingerbread
Merge remote-tracking branch 'cm/gingerbread' into gingerbread