Merge "skip 2d.drawImage.broken.html layout test"