Merge "Camera3: add deferred surface support" into nyc-mr1-dev
am: d2958597bc

* commit 'd2958597bc86d7eab85f007997d8986e1542f7a4':
  Camera3: add deferred surface support

Change-Id: I6d37d0ad9bcb25b13a45f3af3f4adeb7cb00dcf7