d2: Add media profile and fix a crash

 * We were crashing if the user selected 1080p recording on the front
   camera, which hilariously leaves the hardware in a state that can't
   be easily recovered from without rebooting.
 * Update the profile configuration, and remove 1080p from the front
   camera.

Change-Id: I2604c054407cf23f55e11c80e8d69d190cb9ee10
gps: Update to CAF jb_2.3.2, reenable privacy lock.

Squashed commit of:

commit 1fc7e568880473fa15fdac4d7a3b4a9557e2781e
Author: Mike Kasick <mike@kasick.org>
Date:   Tue Jan 1 21:47:51 2013 -0500

    gps: Add loc_eng_set_privacy function to enable/disable GPS privacy lock.

    Privacy lock is enabled on loc_eng_init, disabled on loc_eng_cleanup,
    mimicking the behavior of TW.

    The privacy lock state is non-volatile, and control of the lock is needed
    to ensure that the GPS works and is responsive to requests.  Otherwise the
    GPS may silently cease to work depending on its last state in TW.

commit fe69d4eb5e2cf3ef003def7fa134549ffdadcb53
Author: Mike Kasick <mike@kasick.org>
Date:   Sat May 4 20:44:54 2013 -0400

    gps: Update to CAF jb_2.3.2 (a731b5ab6b3acba561abfcbf1742fb1519607bc3).

    Conflicts:
    	gps/libloc_api_50001/Android.mk
    	gps/libloc_api_50001/LocApiAdapter.cpp
    	gps/utils/Android.mk
    	include/hardware/gps.h

Change-Id: Ia04c76d91963ce4932fb9b74f9425d87705cb861
Merge remote-tracking branch 'upstream/cm-10.1' into HEAD