Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_frameworks_av into cm-11.0
Merge branch 'cm-11.0' of https://github.com/temasek/android_frameworks_av into HEAD

Conflicts:
	media/libstagefright/httplive/LiveSession.cpp
	media/libstagefright/httplive/LiveSession.h

Change-Id: Iad7a053a5f1f1a8000d073f228e6dbcf0515038b