libstagefright: Add support for High Frame Rate Encoding

Based on kkeyhfr key value from meta data, add support in OMXCodec and
MPEG4Writer for HFR mode

Change-Id: I2fe0780865bd01451bf8e77acf028b498c1c9f28

Conflicts:

	media/libmediaplayerservice/StagefrightRecorder.cpp
	media/libstagefright/OMXCodec.cpp
libstagefright: Set high frame rate encoding flag to 0 by default

- Set the hfr flag to be 0 by default
- Do not crash if the meta contains no value for kKeyHFR

CRs-Fixed: 332372
(cherry picked from commit 6712b25b7e600cf29e2940fa61ec5bacf4f1c879)

Change-Id: Ie6cfa21f3df2114dee335b70412f1239cf6376ec

Conflicts:

	media/libstagefright/OMXCodec.cpp
libmediaplayerservice: Enable b-frame recording

- put back setupMPEG4EncodeParmaters call.
- Set nBFrames field to 1 for index OMX_IndexParamVideoMpeg4 and OMX_IndexParamVideoAVC
  depending on the recording profile.
- setprop encoder.video.profile depending on the format
- for H.264, set to one of base, main, high
- for MPEG4, set to one of simple, asp

Change-Id: I7b7647da76390a1adca62d7ef2c8d92365c79e01

Conflicts:

	media/libmediaplayerservice/StagefrightRecorder.cpp
libstagefright: Enable metadata mode recording

- Metada mode video recording is enabled by default.
- use setprop debug.camcorder.disablemeta 1 to disable metadata mode recording.

Change-Id: If994c468c3e24ae03b14462f2311504c3d957426

Conflicts:

	media/libmediaplayerservice/StagefrightRecorder.cpp
	media/libstagefright/OMXCodec.cpp
libstagefright: Fix an ifdef from QCOM merge

Code added in commit ed91abebe3c4017618e283d17a6dbff13a1f24e6
was not completely wrapped in an ifdef as needed

Change-Id: I4855bb4b212db3cf34433ab47eb568db8df14f6a
softwarerenderer: exynos4: mali alignment

Change-Id: I6bbe13570d3ef6c268f637ccf7be9d6843eed91f
stagefright: more exynos4 enhancements

Change-Id: I1f6421ed295804ffc0182b874a26aef755472b51
Merge branch 'ics-mr1-release' of https://android.googlesource.com/platform/frameworks/base into aosp

Conflicts:
	core/res/res/values-de/strings.xml
	core/res/res/values-el/strings.xml
	core/res/res/values-nl/strings.xml
	core/res/res/values-pt/strings.xml
	core/res/res/values-ru/strings.xml
	core/res/res/values-tr/strings.xml
	core/res/res/values-zh-rCN/strings.xml
	core/res/res/values/config.xml
	data/fonts/Roboto-Bold.ttf
	data/fonts/Roboto-BoldItalic.ttf
	data/fonts/Roboto-Italic.ttf
	data/fonts/Roboto-Regular.ttf
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: I376757e52555fe45860f404da5fd2293ea45ddce
frameworks/base:  fix duplicate strings in el/ja/ko translations

Looks like these were duplicated in the 4.0.4 merge, remove one set.

Change-Id: Iabb85f088132a3db94c6e2c2490954641e67e81a
camera: Full support for HTC camera switch

 * Adds the changes for using the "htcwc" switch.
   We still need this even on ICS.

Change-Id: I5f24cb379b359c5796748f496a03ef431c36e283
frameworks/base: SystemUI: fix merge error in NetworkController

Remove dangling else statement.

Change-Id: I40e9facc6d81e70abb7d179c71765520437b89bf
Merge "camera: Full support for HTC camera switch" into ics
Merge "frameworks/base: SystemUI: fix merge error in NetworkController" into ics
Add missing symbols for HTC 8660 camera HAL.

Change-Id: Ia542981bc07cfb22da1bae75af5a4554f7100ef5
Merge "stagefright: more exynos4 enhancements" into ics
Merge "Add missing symbols for HTC 8660 camera HAL." into ics
omxcodec: added buffersize logic back in

got lost with merge of 1d73f2b83f17e009150685be4d40c5f9b4065ae6

Change-Id: I0a185dd1b14d0ced4d96b0d8cc1515b7ba18abea
Add missing symbols for HTC 8660 camera HAL.

Change-Id: Ia542981bc07cfb22da1bae75af5a4554f7100ef5
Merge "softwarerenderer: exynos4: mali alignment" into ics
Merge branch 'ics' of git://github.com/CyanogenMod/android_frameworks_base into ics