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

Change-Id: If539fa993a135fa65411a8d80a2d6acfb2d1fb61