Merge "WAR driver bug where surfaces of size 0 fail." into honeycomb