Revert "[2/2] Change Camera2 to AOSPCamera2"

This reverts commit ae74341b1551d9a30e053aaf25383298ebf6eaf5.

Change-Id: I51745611cc46e5bb5783f21d29f7c51867a2194a
Merge "Revert "[2/2] Change Camera2 to AOSPCamera2"" into du-44
Fetch from Gerrit instead of Github

Change-Id: Ie9b53984d85763e0ab3fa489fc02f5fd57b27668
build: this is DU not CM

Change-Id: Ia6ecf87be5424568ed06913cf2c33ab747ef0fda
Merge branch 'du-44' of https://github.com/DirtyUnicorns-KitKat/build into HEAD

Conflicts:
	core/config.mk