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

* commit '405debd8aa344c4f8ab5fe45c525ed400851f877':
  Camera3: add deferred surface support

Change-Id: I564eec8c447c569eb298a2c992847b68c73576ad