Merge "Camera2: add deferred output config support" into nyc-mr1-dev am: e8526a0105
am: f103fd540e

* commit 'f103fd540e54dddc370aa1049424a7644c889e08':
  Camera2: add deferred output config support

Change-Id: I7662286b333ccce5e18399fd84efb07e167936ea