Merge "Camera: various external camera fixes" into pi-dev am: 5d90142071
am: 60c8a771fe

Change-Id: Ib0429fb543468fa691d2857501f40f21b70622e6