Merge tag 'android-4.4.3_r1.1' into merge

Android 4.4.3 release 1.1

Conflicts:
	media/libmedia/AudioTrack.cpp
	media/libstagefright/ACodec.cpp
	media/libstagefright/MPEG4Writer.cpp

Change-Id: Ib97cf559cbd9428b7e5166b894152a8bd69f9402