cm: Build Stagefright FFMPEG plugin

Change-Id: Ic727bcea4d5cbc35c720800660be7b80d638122d
cm: Underp package names

 * Go back to sleep, Steve.

Change-Id: Ie8aa55981ec2447741119cb413798568174ce659
Merge remote-tracking branch 'CyanogenMod/cm-11.0' into cm-11.0
Integrate duplicated NTT DOCOMO carrier labels

Integrate two separate NTT DOCOMO carrier labels into a single label.

before: http://imgur.com/2D3qjd1
after: http://imgur.com/YJh0gxq

Change-Id: I87c3dcad947cda779b3b4a4b2ffdc2a6f63dbe5c
Merge remote-tracking branch 'CyanogenMod/cm-11.0' into cm-11.0