Revert "mondrianwifi: media: Add HFR attributes for VideoEncoderCap"

This was fixed in the frameworks and not needed anymore.

This reverts commit 335035888ea57a7f579b0956d527e44ee933ec4f.

Change-Id: I1b9607b9a96772927d5d84c03d328f5b70beb728
mondrianwifi: camera: Code cleanup

Change-Id: I6465f70f47844030cbbc247cb4d38c965454cacc
mondrianwifi: camera: Add our wrapper and disable the msm8960 one

When I cleaned up the proprietary files, I accidentally disabled
our camera wrapper.  Re-enable the wrapper and at the same time
ensure we don't build the msm8960 one that we don't use anyway.

Change-Id: Icd0cffcf1655341fd1d6f2e139b3803cf7cb2063
mondrianwifi: camera: Allow hfr recording to be turned off

This fixes an issue where you cannot record 1080p videos
which is also unfortunately the default recording mode.

Change-Id: I5cf2afb3c47afc7dacad50e8d0ec3da109c0a34f
Merge branch 'cm' into HEAD

Conflicts:
	camera/Android.mk
	camera/CameraWrapper.cpp

Change-Id: Ib86d139a4038cdca83cdfb56e684b738fe462b73
Signed-off-by: DHOMD <DHO@dho.im>