am 25c8c528: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

* commit '25c8c528':
  Camera2/3: Move recording frame processing to its own thread.
  stagefright: Fix port-reconfiguration & output-buffer-filled race condition
  Camera2/3: Don't trigger AF when in INFINITY focus mode.