Merge "Change overdraw test to use windowbackground" into nyc-dev
am: 34979a3af6

* commit '34979a3af6dbb6e3e33a83e5cb939ea3c8c000c7':
  Change overdraw test to use windowbackground

Change-Id: Ie116603fc53999dd4251d940b5d5ee783684ac8e