Update for Motorola Triumph

Conflicts:

	libs/ui/Android.mk
	services/java/com/android/server/WiredAccessoryObserver.java
	telephony/java/com/android/internal/telephony/QualcommSharedRIL.java
	telephony/java/com/android/internal/telephony/SamsungCDMAQualcommRIL.java
	telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java