Merge tag 'android-4.4.2_r2' into android-4.4

Android 4.4.2 Release 2

# gpg: Signature made Thu 13 Feb 2014 01:05:22 PM CST using DSA key ID
9AB10E78
# gpg: Can't check signature: public key not found

Conflicts:
	media/libstagefright/AudioSource.cpp
	media/libstagefright/AwesomePlayer.cpp
	media/libstagefright/DataSource.cpp
	media/libstagefright/OMXCodec.cpp
	services/audioflinger/RecordTracks.h
	services/audioflinger/Threads.cpp
	services/audioflinger/Threads.h
	services/audioflinger/Tracks.cpp