Merge tag 'android-4.4.3_r1' into HEAD

Android 4.4.3 release 1

Conflicts:
	VolumeManager.h

Change-Id: Iec0d22171800cd506bf33f989b4d5844796e50be