cm: Build Stagefright FFMPEG plugin

Change-Id: Ic727bcea4d5cbc35c720800660be7b80d638122d
(cherry picked from commit 08bfcb3644fbf7574eac1e3f6117df617970f2b8)
cm: Underp package names

 * Go back to sleep, Steve.

Change-Id: Ie8aa55981ec2447741119cb413798568174ce659
(cherry picked from commit f1deb14ac0f163aa5a9f3e4f2561f238bbafc125)
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
(cherry picked from commit b60442e44330fb2aaf7cd1bd7f54a91ea0cd4dd4)