Add FFMPEG and stagefright-plugins to the project

Change-Id: Iec58ed53f953304d8b78fd7561548fa771b33349

Conflicts:

	default.xml
Merge remote-tracking branch 'PA/kitkat' into legacy-staging

Conflicts:
	default.xml