libmediaplayerservice: Fix commit https://github.com/omnirom/android_frameworks_av/commit/4fbfd595ee192e0617c0cedf58259c8f41f466dd

Change-Id: I5c90d7abe13bffa778e8f955f280b44156f13b2d
libstagefright: bring back mistakenly removed codec quirks

http://review.cyanogenmod.org/#/c/59396/ has mistakenly removed
3 of the codec quirks that are required for certain audio codecs
on OMAP3.

https://github.com/CyanogenMod/android_device_lge_p970/blob/cm-10.1/configs/media_codecs.xml#L28

The implementation of the quirks are still in the upstream code
and they have nothing to do with Legacy HTC.

Change-Id: I2d47bc9cbb451675c5bac6e725c59b367ff458dc
Merge "libstagefright: bring back mistakenly removed codec quirks" into android-4.4
Merge "libmediaplayerservice: Fix commit https://github.com/omnirom/android_frameworks_av/commit/4fbfd595ee192e0617c0cedf58259c8f41f466dd" into android-4.4
Merge remote-tracking branch 'omni/android-4.4' into android-4.4

Conflicts:
	media/libmediaplayerservice/StagefrightRecorder.cpp