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

Change-Id: Ia95cef61c14f13c06f52fdee825f38709c8fe576