Merge "mm-camera: Changes to remove unused code for security issue reported"