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

Change-Id: I4384f686dedfca5f012697368162c32a683db74e