Merge changes I6de585de,Id0f9b5a9

* changes:
  camera2: Remove partial result nodes for error frames.
  camera2: Improve code readability for FrameNumberTracker.