Merge "Abort read() after CameraSource has stopped" into pi-dev
am: 29ac15a480

Change-Id: I517783fd0c715a57a112f9c885081794c862f45e