Merge "Skip tests if it includes unsupported locale/charset" into gingerbread