Merge "Revert "merge camera jfactive sources"" into cm-10.1