Track CM 'frameworks/opt/hardware'

Change-Id: I65662b499ed3432f51ee3e708124a0b806b5d994
Track CM external ffmpeg and stagefright-plugins

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Merge remote-tracking branch 'github/lollipop' into L

Conflicts:
	default.xml

Change-Id: Ied1695b0728463b21e3cb6ce6e8ed6f68174c762
Revert "Track CM external ffmpeg and stagefright-plugins"

This reverts commit f168b6682811a2b0d4d5e124c65d7edb08deed79.
Merge branch 'lollipop' of https://github.com/AOSPA-legacy/manifest into L
Revert "Revert "Track CM external ffmpeg and stagefright-plugins""

This reverts commit 4c2b1d1c48d18fc6ff169c1eb2e7af751b6742ee.
Track CM external ffmpeg and stagefright-plugins

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Merge remote-tracking branch 'github/lollipop' into L