Refactor camera factories to reduce code duplication

Change-Id: I5f5c899f595dbbaa9fa181c5caa092d4bad69f07
31 files changed