Merge branch 'koying/adddroidlibstagefright'

Conflicts:
	tools/depends/target/Makefile
	xbmc/android/activity/XBMCApp.cpp