am 49bca3aa: Merge "Adjust Tests to Work without Hinting" into gingerbread

* commit '49bca3aafbcc877e4ea06bcdfab8dab060ef7244':
  Adjust Tests to Work without Hinting