Automatic translation import

Change-Id: Ia185f22fa6aad0f2bfaef17971efe4308eb96fa2
Automatic translation import

Change-Id: I3e1b5382c597d9ccd2c6d91fa9c0992518f4d287
galaxys2-common: Update recovery_keys

Cleanup and update, see: http://review.cyanogenmod.org/62724

Change-Id: If92804a89fb403defc904183fae8422047381a31
Automatic translation import

Change-Id: If5ec655feb097a5debaa62bc25d3116b459b7a36
Enable use of FFMPEG codecs for extended formats

credits to CyanogenMods other device maintainers (saw it on hammerhead)
this fixes m4a playback on Google Play Music for example.

Signed off by Myself5, Carbon Rom i9100 Device Maintainer

Thanks to Scott B for guiding me to this fix.

Change-Id: If457524ab66de2c7e2c6f9de43345111ee08b3b8
Merge branch "cm-11.0" into kylin