Merge remote-tracking branch 'caf/kk_2.7_rb1.17' into android-4.4

Conflicts:
	include/media/AudioParameter.h
	include/media/MediaProfiles.h
	media/libmedia/AudioParameter.cpp
	media/libmedia/MediaProfiles.cpp
	media/libmediaplayerservice/Android.mk
	media/libmediaplayerservice/MediaPlayerFactory.cpp
	media/libstagefright/ACodec.cpp
	media/libstagefright/Android.mk
	media/libstagefright/OMXCodec.cpp
Small fix
Merge branch 'android-4.4' of https://github.com/daeiron/android_frameworks_av into android-4.4

Conflicts:
	media/libmediaplayerservice/MediaPlayerFactory.cpp