Merge remote branch 'cm/cm-10.1'

Conflicts:
	media/libstagefright/Android.mk
	media/libstagefright/FMA2DPWriter.cpp
Merge branch 'cm-10.1' of https://github.com/androidarmv6/android_frameworks_av into cm-10.1

Conflicts:
	media/libstagefright/FMA2DPWriter.cpp