am 88f05039: Merge "Remove Some Broken Paint Tests" into gingerbread

* commit '88f05039c6b25935a7c6be796a7072df3821bc8f':
  Remove Some Broken Paint Tests