Merge https://github.com/ivanich/android_device_htc_pyramid into liquid

Conflicts:
	ril/telephony/java/com/android/internal/telephony/HtcMsm8660RIL.java
Merge branch 'liquid' of https://github.com/Sajito/android_device_htc_pyramid into liquid