am 4212d3fc: Merge "Refactor ViewGroup.drawChild() into View.draw()"

* commit '4212d3fc736712d6e5fb69d5067ce8d9a83806ef':
  Refactor ViewGroup.drawChild() into View.draw()