Squash 4.3 changes

Conflicts:
	Android.mk
	DirectVolume.h
	VolumeManager.cpp
	main.cpp

Change-Id: I22ad8c81a78889df0c7d506596606a27d1be5624