Merge "Camera: Do not forward capture_result in error condition" into pi-dev
am: 99a619059a

Change-Id: Ie32b591772e8f8a2e9fe614ee809c39e51971032