am 9cca6a44: Merge "Skip tests if it includes unsupported locale/charset" into gingerbread

* commit '9cca6a44c922649806cb8a79efc5f615f97e30a1':
  Skip tests if it includes unsupported locale/charset