Merge "Refactor ViewGroup.drawChild() into View.draw()"