Revert "build CameraWorkaround Patch #2"

This reverts commit 481e172604b599f71ab36ed8ee89caa7e707a0c1.
build CameraWorkaround

Change-Id: Ic503d54e77b6f4e6d655ca4f09783812657977c0