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

Change-Id: I87118a7bf7c0009e443911cd6d39dcdda6cf1299