Merge tag 'android-4.4.3_r1' into HEAD

Android 4.4.3 release 1

Change-Id: I389b09d150f725e0f49a9d8706838455314b7904

Conflicts:
	media/libstagefright/MediaExtractor.cpp