Merge "Camera3: don't let dequeueBuffer block indefinitely" into nyc-mr1-dev
am: 440fa2cdb4

Change-Id: I6f4eafa8b9be481b1d3b136283f4e58d5ff11836