More naming corrections

(cherry picked from commit 519686f042947625d75be27934f732eaaf445718)
HLTE:  Use camera wrapper.

  Use wrapper to prevent camcorder crashes
  while trying to use Digital Image Stabilization.
  Wrapper borrowed from mondrianwifi.
  BUGFIX: JIRA CYAN-4054

Change-Id: I90611faf74d44febea12be3e72d0ec5a526d88a2

Conflicts:
	proprietary-files.txt

(cherry picked from commit aef0831c0346a78a20fb2586a2399d298247cc18)
Fix BT naming

(cherry picked from commit 732ee7383bf75ca925f08d28c1ee29d6ee486096)