Revert "merge camera jfactive sources"

merging forks branches is not a good idea

This reverts commit 981d1b772d2309f699921c875d586098ca36cbde

Change-Id: I82331cf1c7fc7979ab587ecdd3de43dda45db9f3