Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_device_sony_rhine-common into pimped-kernel

Conflicts:
	rhine.mk

Change-Id: I277ba9418ecd9ee4908fe1857f14171fbe40965a
BoardConfig: switch back to TWRP

Change-Id: Iecff5bd96c9588113624a96f14ecb70c436f324e
Merge branch 'pimped-kernel' of https://github.com/PimpedKernel/android_device_sony_rhine-common into pimped-kernel