Merge changes I5762a98d,I39f4e015 into oc-dev

* changes:
  ViewRootImpl: More careful draw accounting.
  SurfaceView: Avoid over-reporting DRAW_FINISHED.