Fixes for x10mini Radio (audio routing from/to speaker not working yet)

Change-Id: Ic44d204c92768b721dfec0fc5b2b9ddf4e6fdbd7

Conflicts:
	core/java/com/android/internal/app/ShutdownThread.java
	media/java/android/media/AudioService.java