Track CM external ffmpeg and stagefright-plugins

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Merge branch 'lollipop' of https://github.com/AOSPA-legacy/manifest into lollipop