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