Revert "Merge https://android.googlesource.com/platform/packages/apps/Camera2 into kk-devel"

This reverts commit a83713a92a3b799514e6927f120b46a742018009, reversing
changes made to bef79fe2beece7d41eccabd742378cb6d466eaf3.