Camera2 cleanup

- fix duplicates causing build errors after merge

Change-Id: I5bee8232b50d694f449ca672eb5964ab951bc422